Code and warning cleanup