Updated to fit coding standards