Code clean up - attempt two