Minor changes for a cleaner code