Messed up last commit. Cleaned code as well.