Cleaned up some code

cleaned some code and ignored more test files