|#000| code cleanup, warnings removed