Cleaned up claim and general stylings