cleaned up rhtml