Some cosmetic changes

Some cosmetic changes. Removed semicolons and return operator.