Ready to refactor the new things added