fixed codestyle, paging