Cleaned up code and added names