Cleaned up code.
Clean up