Fixed slight bugs and indentation