Code Cleanup & Changed CurrentObject to field