Use literals where possible
Remove empty line