Cleaned up code and split sections into partials