Fixed indents and bugs