Cleaned indentation
Fixed Lucas' conflict resolution fuckup