Fix indentation and stuff