Add comments and try to make function names more helpful