Removed unneeded files; various fixes and style changes