Fixed indentation and some fixes