Make the gutter smaller and code cleanup