Cleaned up code and added name