Refactor some
Updated git ignore