Final changes and beautification