More consistent code style, deleted method stubs/unused code