refactored some code
ignored some files