(enhancement) code cleanup and styling tweaks