add margins, fix rubocop errors