Modification and Code Cleanup