Effective Tracking of Building Energy Use: Improving the Commercial Buildings and Residential Energy Consumption Surveys