Cleaned up the SWRL rule and SQWRL query renderer