improved readability, styling, coding guidelines