Refactored for style

TL; DR.