Some cosmetic changes
Initial commit of version functionality