Added rule #5 and general clean up