Add bad practice fixes #3