Code cleanup on everything