Cleaned-up code and update release information