little blocks code cleanup