Clean code and remove unnecessery logging