Fixed indentation issues
Hopefully fixed horribad merge