Clean code + fix test