ECE-482 Removed all # and cleaned up indentation