fixed formatting, split up some components