More source code shuffling

Moved comments and return types, switched to uint types, added
"override" keyword.