Code cleanup and footer view cleanup