Code cleanup

Same idea as previous commit; just to be less verbose