lint, comments and cleanup