Cleaned up code and added personal info