Devel

Updated files and new formatting added