Converted function application to new syntax, reworded and reformatted some stuff