made code prettier and added cool features