minor refactor

Hey bro,
have a look, don't be afraid to be honest, take what you like, chuck what you don't.