improved code styling