Cleaned up code

Some clean up on the PR