[FIX] cleanup, add documentation