Clean up code more