Code cleanup and some styling