cleaned up code-base

cleaned