- Fixed bug, clean and commented code