Code clearned up