* Remove unnecessary rules and definitions * Refactor so that it's easier to read * Update comments for better understanding
