Changed PreAuthorize annotations
Some code cleanup