Change License, Refactor main, Fix whitespace