Changed hours per week to be calculated on render
Got rid of commented code