Quixey - Small update, implemented recommended changes

/cc @jagtalon @nospampleasemam 

Implemented the fixes you guys recommended. Also fixed indentation.