Issues/2. More code cleanup.