Followed code conventions