Removed commented out code for readability