Removed / line breaks and added TODO for rules