Removed hardcode default interest period and some clean up