Updates and code clean-up