Reformated code again (was getting messy in certain places).