Change to 2 space indent
Remove ugly false defaults with cleaner undefs
Minor clean ups