Some cosmetic changes; refactored a head partial
Starting commit