Removed commented out code and passing of un-required parameters (level, period)