Basic code cleanup.
Add an only numeric check