visual refactor - fixes