cleaned up format

cleaned up code layout/look