Reformated the code, this is only temporary