Less readable formatting changes throught the code ;(