Some code cleaning + clarifying (TODO: work on variables names)