Little cleanup

Following the code format :smiley: