Small design tweaks & code organizing