Some more code cleanup from feedback