Formatting corrected and some warning suppressed