cleaning up and adding better j k