Cleaned up comments. Removed hardcoding of function parameters.