Organizing code, changing style