Fix: Cleaned up the code.