Style changes

Added SAL annotations
Remove useless while loop