properly declared const arguments
properly declared const arguments, refactored if-sequences