Henrik Reitan
-Overall cleanup, removed most lint warnings