Code cleanup from inspection