Code style modifications and new functionality
Beta version complete