Making methods private, refactoring exception into single file