Clean
Added some more customizations