Remove pointless functions.
Indentation etc.