Minor changes for better looking