code cleanup, syntax