Remove update checking, cleanup and formatting