structure.sql code cleanup