#47: Cleaned up code.