code cleanup
reduced fs size
reduced fs size