Some double spaces removed

Also removed some empty lines and fixed some doc blocks for consistency