[#46][#19][#6]Some small tweaks

- General code cleanup.