Clean code + fixes