Tweaks & code organization