Resolve FIXME
Update JavaDoc to match function content