cleaned up code during harsh code-review