Ran Lint and cleaned up Source Code