Cleaned to match coding conventions