Cleanup & added comments