Fix const correctness & cleanup superfluous semi-colons