Cleaned up Slave code to better reflect Coding Guidelines