Fixed code style, added TODO