More comments and code cleaning! :D