Cleaned up page parsing