Cleaned up whitespace (now all indentions are with 4 spaces). Fixed crlf-errors in some files. Removed unused imports.