Some fixes to naming and removed white spaces