cleaned up the last commit a bit, fixed some styling