Modified source code to follow PANDORA's coding guidelines