Cleanup and added copyright