Conventional improvements

Take a look, may help! :P