Fixing Functions, and Fix indentation