Reformatting
Simplified the code a bit morre