Cleaned up code, fixed hover bug