fixed coding conventions; added TODOs