Small fixes... code cleanup