Removed unnecessary files.
Added some consistency with syntax.