Cleaned up to standards