fixes compiling with make
fix some indentation
should fix 1.7.2 compatibility
make a 5 line if a one line return