Added missing parameters
Clean code