refactoring
weird git hickup