Formatting + Fixed some warnings