Minor Refactoring

Made few fields more pretty