Cleaned up code or messier idk