~ Cleaned up code