Changed layout of file. Some other minor changeds