Cleaned up code and