Clean-up and added author/license info