CS fix
Code cleanup