styling

haven't fixed switch statements because I'm lazy