code standards cleanup
implementing logout
name switch