Code styling & cleanup...