Update #4

Cleaned up further mess inside the code.