Moved the preferences options names in the constants module
Code cleanup