Fixed style stuff, added command line arguments

Fixed spacing + changed from hard tabs to two spaces. Fixed some other
style issues. Removed useless imports.