LC completion, code clean-up