Added strict wrapper and changed some code styling