Cleaned up garbage in the markup