Make code more simple. Adhere to coding convention.