Removed of hardcode default interest period and clean up