Cleaned up Code.