Cleaned and organized code.