Clean up code - Added author