Aligning source with keys

Closes #203