Little more cleaning up in the source code
Last bit of cleaning