Clean code slightly