Code Cleanup + Documentation