Reworded to make the requirements more clear
Removed some useless code for preparations of completing requirements