Some code style fixes. Code now looks much better (: