Provide column names for INSERT query

Plus code tidying