More indentation fixes, function keyword removal