Removed empty implications and cleaned up code