Significant code cleanup, responsive