Bug Fix: Wrong Conditional Expressions
Code Clean up & Preparing for i18n