Minor code reformating
WIP schema and triggers