Refactored names and removed comments