Removed some moldy code and fix indenting