General cleanup. Formatting. Should fix the video breaking bug.