Cleaned up for coding guidelines