Small cleanup + added authorship