Removed comments, extra funcs