still cleaning up code, better formatting in views