[CLEANUP] Performing code cleanup and documentation