Improve code style

Fix:
.nil?
indentation