style changes and organized modules and controllers better