some basic changes to improve the coding