Code Cleanup + Rename