Renamed and merged methods

Removed plenty of comments... I will try to explain things better in the
future.

Also, I will need to plan a new and BETTER structure for the project as
soon as possible!