Minor changes for cleaner code