+ Cleaned up code