Few indentation fixes and stuff