Problem: @alshakero pointed out changes that would make the code more readable
Problem: @alshakero pointed out changes that would make the code more readable

Solution: refactor the code

Starcounter/starcounter-include,Starcounter/starcounter-include